Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

⬆️ FreeCAD v1 #3304

Merged
merged 38 commits into from
Nov 29, 2024
Merged

⬆️ FreeCAD v1 #3304

merged 38 commits into from
Nov 29, 2024

Conversation

je-cook
Copy link
Contributor

@je-cook je-cook commented May 29, 2024 •
edited
Loading

Linked Issues

Hopefully but needs checking
closes #1347
closes #513
closes #3236

Description

  • FreeCAD V1 from conda-forge
  • Removes XPASSing test marking.
  • Adds reasons for some of those still failing
  • Fixes some different CAD exports (inc webgl which is quite useful)
  • Adds the ability to import CAD files

Interface Changes

Checklist

I confirm that I have completed the following checks:

  • Tests run locally and pass pytest tests --reactor
  • Code quality checks run locally and pass pre-commit run --from-ref develop --to-ref HEAD
  • Documentation built locally and checked sphinx-build -W documentation/source documentation/build

@je-cook je-cook added cad Tasks relating to the cad module dependencies Pull requests that update a dependency file labels May 29, 2024
@codecov Codecov
Copy link

codecov bot commented May 29, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 75.32468% with 76 lines in your changes missing coverage. Please review.

Project coverage is 76.54%. Comparing base (80c1c27) to head (467949e).
Report is 1 commits behind head on develop.

Files with missing lines Patch % Lines
bluemira/codes/_freecadapi.py 75.48% 63 Missing ⚠️
bluemira/codes/_freecadconfig.py 61.90% 8 Missing ⚠️
bluemira/magnetostatics/fem_utils.py 83.33% 2 Missing ⚠️
bluemira/geometry/tools.py 83.33% 1 Missing ⚠️
bluemira/geometry/wire.py 50.00% 1 Missing ⚠️
bluemira/magnetostatics/finite_element_2d.py 75.00% 1 Missing ⚠️
Additional details and impacted files 
@@             Coverage Diff             @@
##           develop    #3304      +/-   ##
===========================================
- Coverage    76.55%   76.54%   -0.01%     
===========================================
  Files          230      230              
  Lines        26835    27028     +193     
===========================================
+ Hits         20543    20689     +146     
- Misses        6292     6339      +47

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@je-cook je-cook force-pushed the je-cook/freecad_v1 branch 2 times, most recently from 2f3beb9 to 06015d8 Compare June 10, 2024 08:27
@je-cook
Copy link
Contributor Author

je-cook commented Jun 12, 2024 •
edited
Loading

importing needs to be scaled because we save in mm but the default internally is in m done

@je-cook je-cook force-pushed the je-cook/freecad_v1 branch from e9af871 to 59e8451 Compare June 13, 2024 07:07
@je-cook je-cook force-pushed the je-cook/freecad_v1 branch 2 times, most recently from c6d2c18 to 429ecbe Compare June 28, 2024 14:46
@je-cook je-cook force-pushed the je-cook/freecad_v1 branch 2 times, most recently from 054e6d8 to ec95702 Compare July 9, 2024 08:17
@je-cook je-cook force-pushed the je-cook/freecad_v1 branch from 58f5de6 to 06df08a Compare July 19, 2024 07:30
@je-cook je-cook force-pushed the je-cook/freecad_v1 branch from 06df08a to ebfc9a3 Compare July 30, 2024 09:59
@je-cook je-cook force-pushed the je-cook/freecad_v1 branch 2 times, most recently from f098849 to ed4831a Compare August 14, 2024 12:38
@je-cook je-cook force-pushed the je-cook/freecad_v1 branch 2 times, most recently from 797845d to a3ab10a Compare August 29, 2024 09:22
@je-cook je-cook mentioned this pull request Oct 4, 2024
Closed
@je-cook je-cook force-pushed the je-cook/freecad_v1 branch from 2264c3d to d10963b Compare October 10, 2024 09:30
@je-cook je-cook force-pushed the je-cook/freecad_v1 branch 2 times, most recently from e485e2c to 6e85da9 Compare October 21, 2024 15:26
This was linked to issues Oct 22, 2024
Some of these crash on CI (?) #3668
Closed
Investigate this princetonD parameterisation #3672
Closed
@je-cook je-cook force-pushed the je-cook/freecad_v1 branch 2 times, most recently from 872e354 to 405981b Compare October 23, 2024 07:13
@je-cook je-cook force-pushed the je-cook/freecad_v1 branch 2 times, most recently from 843995c to e089f59 Compare November 7, 2024 10:30
OceanNuclear
OceanNuclear approved these changes Nov 28, 2024
View reviewed changes
Copy link
Contributor

@OceanNuclear OceanNuclear left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comment given in-person, looks sensible, looking forward to applying these changes and seeing the updated version of freecad.

@sonarqubecloud SonarQubeCloud
Copy link

Quality Gate Passed Quality Gate passed

Issues
62 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

@je-cook je-cook merged commit aa8317b into develop Nov 29, 2024
10 of 11 checks passed
@je-cook je-cook deleted the je-cook/freecad_v1 branch November 29, 2024 10:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@oliverfunk oliverfunk oliverfunk left review comments

@OceanNuclear OceanNuclear OceanNuclear approved these changes

Assignees

@oliverfunk oliverfunk

@OceanNuclear OceanNuclear

Labels
cad Tasks relating to the cad module dependencies Pull requests that update a dependency file
Projects
None yet
Milestone
No milestone
3 participants
@je-cook @oliverfunk @OceanNuclear